Fixed bug #4172 with QA_4_1 as base

This pull request is rebased to QA_4_1