Merge branch 'patch-5' into 'manual18.05.x'