Merge branch '201810-452B' into 'master'