Merge branch 'patch-6' into 'manual18.11.x'