FYI @ibelyaev. I tried a cherry-pick (as usual) of MR!263 from 2018-patches to master but GitLab complained. I just did things manually and locally, to get this ticked off.
merged
mentioned in commit 2537d766