Merge changes (12/38)

Merge changes