Resolve "KeyedContainer move constructor does not preserve object version"

On top of the backport of !662 (merged), this includes some other backports to have a working gitlab-ci pipeline.