updates after deshipu's review on PR #521
Merge remote-tracking branch 'ambv/rq' into reports_dev