simplify context and only create hash map if required
import tutorials
upgrading to 2.1M2
upgrading to 2.1M2
fix some docs