Fix match insert to run after update.
Merge branch 'develop' into notify