BS-2467
Merge branch 'master'