Merge "Add frame rate compatibility GTE logic" into main