Update dev branch with master (active membership accuracy fixes)

Merged Martin Lowe requested to merge master into dev

Merge request reports