Merge commit 'refs/integration/team/platform/dev-79'