Merge "Remove checks based on Generator" into release-4-5-patches