Merge "Clean up clipping and deferral logic"