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


Former-commit-id: 0d81f8308a4a713761c36045d8081549a6a333e2 [formerly 0d81f8308a4a713761c36045d8081549a6a333e2 [formerly 6eb57b6ba4e06f62767c81cc34a291cefba68e97]]
Former-commit-id: f807aacd5ae3df9e9c278f29b7c3bb97982d82fa
Former-commit-id: c4bd06b5cc0b624dcf4a1703082c7eec6d1eaf92
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine