Merge branch '201908-8412' into 'master'