Merge branch 'master' into assertion-records