Merge branches 'debug' and 'idle' into for-armsoc