Merge pull request #6354 from shellixyz/feature/prevent_fs_from_overriding_motor_stop