Merge branches 'idle-fix' and 'misc' into release