Merge branch '2020-06-12-next-net' into next