fixes #17622 _StoreMixin is not handling properly the move use case

(cherry picked from commit 79805889ad01aa62ed241c699811dac5c76c2135)