MANTA-127 prep for full RG support