missing triggers
remove patch
Merge testing into develop
add (developer-related) patches