Merge changes from topic "for-upstream" into integration