Changes to reflect v1.2 instead of master branch