Merge branch '1.x' into 209-modules-functionality