Merge "Safeguard against uncommon scenarios when pruning" into oc-dev