Merge remote-tracking branch 'arm-current/fixes'