pull 379, outline revert, etc