Merge changes (10/38)

Merge changes