BS-7904, delayed to 6.3
Merge branch 'release-6.2.6' into 6.2.x