Merge "Enable preliminary subtypes for F-release"