Propagate again updates to 7.0.X branch

Forward port of #68, #69, #70.
All configs run except full-hadronic