Merge version-15 into version-15-hotfix

Merges version-15 into the hotfix branch, keeping the hotfix side on the one conflict.