Merged changes from branch 'suetanvil'.