Merge branch '6.3.x' into 'BS-8729_StudioTabSize'
Merge branch 'BS-8729_StudioTabSize' into '6.3.x'