Merge branches 'd3cold', 'bugzilla-37412' and 'bugzilla-38152' into release