Merge branch 'US#237_Tasks#529'
Merge branch 'US#237_Tasks#529'