QA-5440 : improvement according to code review AND-169