Addressing review comments
Addressing review comments


Former-commit-id: e6c58c44c6dc5ded514a208ea8760d871b9a0673 [formerly e6c58c44c6dc5ded514a208ea8760d871b9a0673 [formerly 5d46d851b1fae55896f781f33094cbbd28729b5a]]
Former-commit-id: 07af052e2fe1632a6be2eec58be64149f131d6ea
Former-commit-id: 05ca4acaac84d98e1e93b81f32da598e22da9b6d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine