Merge branch '2020-04-11-CI-further-improvements' into next