Merging 1.2-dev branch to Master Head