Bring in #1352