Implemented review comments
Implemented review comments


Former-commit-id: f19ab9cde33452ffe87ee2eb09e3a1e73c06f710 [formerly f19ab9cde33452ffe87ee2eb09e3a1e73c06f710 [formerly 94229509bbb733b1a023c8a7cceaadca8823e084]]
Former-commit-id: f93f1dac5da65b984a133b4b38b6b56fe2ff7f1a
Former-commit-id: 0fe07966a48336c420ec0cf7bd596426bfed0f1d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine