Merge branch '6.3.x' into 'BS-8834_CustomUserInfoFilter'
Merge branch '6.3.x' into 'BS-8834_CustomUserInfoFilter'
Merge branch 'BS-8834_CustomUserInfoFilter' into '6.3.x'