Merge "Fix get_frame_type function"