AUI-1332 Yogi loader regenerate