Merge master to 1123, the branch that will be used to deploy in the cloud DEV 

1123, the branch that will be used to deploy in the cloud DEV