BAP-498: Investigate failed builds
 -  CR changes
Merge remote-tracking branch 'remotes/dev/master'