Merge branch 'ppiech/Bug372181'