Merge branch 'tempany' into merged-reports