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


Former-commit-id: b15fbaa5adcf57bfa89da36f69f6c67522ff4b96 [formerly b50aab8eee7df6c7743e445c440924849ee04cef]
Former-commit-id: 25b7f20358d05280b57fd2ffc56e9e4a799a70b9
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine