Merge branches 'release', 'bugzilla-12011', 'bugzilla-12632', 'misc' and 'suspend...