Merge branch 'tt/profile-build-fix' into next