Merge newer changes
Code merge
Merge changes from master