Merge "Fix improper clipping after a save()"