remainder of patch
MANTA-67 proposed stabilization