Merge v1.1 into Master branch