Rel v6r10 fixes

Issue #1755