Manually merge more of lts-tyson's work on Razor in v3