Merge "Cleaning up skip context calculation."