another minor enhancements
another minor enhancements


Former-commit-id: 808cd6f7f095442c76333f6217ca4042eaefc5ce [formerly 3bd0140ecc63a052ffeea38d18a6ca29957cb6bf] [formerly 3bd0140ecc63a052ffeea38d18a6ca29957cb6bf [formerly 3d67c37d7daf5e31bfdc453fdb8c76829e77febf]]
Former-commit-id: 8860bf847d52945a110ce2552a6d164f1e058044
Former-commit-id: 0ae3877f37f080adee4d95205b05237d2e4c861d
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine