+ handle new record events slightly differently in controller for future compatibility
Merge branch 'release/1.6' into develop