Merge branches 'bugzilla-14446', 'bugzilla-14753' and 'bugzilla-14824' into release