Re-rolling #23 against 2.0.1 as 2.x-dev have some code changes which case the...