Merge branch 'm24_MDL-36364_Improve_the_deletion_logic' of https://github.com/scara...