Upstream dev to 3.9-rc8

Dev unstable before upstream, thus untested after upstream. The upstream is to 3.9-rc8, though changes were tested in master only for 3.9-rc1 - might need additional adaption of our code.