Merge "primary progress updated to fix clipping problem"