Merge branches 'release', 'bugzilla-11880', 'bugzilla-12037' and 'bugzilla-12257...