Merge "Add isFeatureEnabled by checking with apex module version" into mainline-prod