fix BS-8424
Merge branch 'master' into 'castorBugFixing'
Merge branch 'castorBugFixing' into 'master'