Merge "Conditionally skip reference frame check"