Merge branch 'pc/occurred' into maint