Merge branch '6.4.x' into 'BS-11585_NewLazy2'
Merge branch 'BS-11585_NewLazy2' into '6.4.x'