Merged changes from stable-1.1