More work [skip CI]
More work [skip CI]


Former-commit-id: 2d116412175efdeb752efe042a808776514b0e78 [formerly 1305f45d973a6dd16816feecf116b449839a9717]
Former-commit-id: 09352cb13eed5464b9834735cd00174eb42445fb
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine