Test fix: test_sync_tasks
Merge "Test fix: test_sync_tasks" into develop