Fix quality flaw
Automatic merge from branch-4.5

* origin/branch-4.5:
  Fix quality flaw