Merge "Partial unclipped save layer support"