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


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