Oups! This TODO was important to do when we have worked on the Node move notification!