BAP-498: Preparing release changes
Merge remote-tracking branch 'remotes/dev/master'