Merge branch 'dnp/tafe_movement_ATS211170' into sprint77