MANTA-127 prep deactivated branch merge
MANTA-127 merge details