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


Former-commit-id: cb91a0b8d8e3d318266baf11c4d77e07f733b7ca [formerly 16e12c3c479399719d9e76f6d4b0029058d39e9f] [formerly 16e12c3c479399719d9e76f6d4b0029058d39e9f [formerly 1e564ae41bf492607b01f00dc38879b84594501f]]
Former-commit-id: f13bbb450c42e07f047fc3977d2930f06754f8e8
Former-commit-id: 6bf63d867cfaf58b5d0d2ac82fb5d1c704c84521
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine