Bringing latest changes from 1.1.2-beta into 1.2-alphaRebase.