Backport 100 continue fixes to 2.0.x branch