Merged changes

Merged changes