Merge "Ensure task moved under mutex" into devel/master