Merge branches 'bugzilla-14207' and 'idle' into release