Merge changes (7/38)

Merge changes