Merged changes from dev-1.1.0-Temp to dev-1.1.0