Merge branch 'manual18.05.x' into 'master'