Resolving previously introduced warning.
Merge branch 'branch-6-2'