KATTS-2035 Merging staging into master with changes from KATTS-2645