FIX: v6r10 conflict (still)
Merge pull request #1707 from sposs/patch-1

FIX: v6r10 conflict (still)