Merge branch '2018.08-rc'