Bring inline with upstream master