Merge branch '4322-restore-abort-motion-if-calcaxis-only' into 'master'
Resolve "restore abort motion if CalcAxis only"
Closes #4322 (closed)
See merge request !6293 (merged)
(cherry picked from commit fc3dae47)
7cacc3a2 restore no motion if calc only