Merge "Workaround for broken 'ps' command on M."