Merged changes from  -