Cherrypicked 4c2b. NOTE: Includes -syscheck