MANTA-127 fix RG logic/runtime based on initial testing