[509661] Regenerate with better and/implies/or
33 files changed