Ported the latest developments of the IsolationCorrection tool from 21.2 to master.
Tagging @htorres, @jdevivi, and @lheinric.