Closes issue #1709
Closes issue #1711, and changes where the update references are stored
Merge branch 'rc3' into feature-reporting