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


Former-commit-id: d8136f4390d410f64857e85e660535e706249409 [formerly 6ad90b160e41c8b9f197c5d314ad6ce0009f66c0]
Former-commit-id: 8fb05e7a9a4c8dd80d7b3fac21614e8573a5cfa7
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine