Merge branch '2019.06-rc'