MANTA-67 isolate reording in scanner
remainder of patch
MANTA-67 proposed stabilization