merged the latest reports changes from master branch.