AUI-1388 Yogi loader regenerate