Re #8410. Made modifications as suggested by Russell.
Merge branch 'feature/8410_task_mutex_shared_ptr' into develop