QA #112
Merge branch 'QA#112'