(3.11) T2CM-86 : Fix stop removals before update or create
See merge request !1849 (merged)
(cherry picked from commit ef6ea846)
2de094c9 T2CM-86 : Fix stop removals before update or create