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