Resolving #4638.
Merge branch 'branch-6-2'