higher priority for filter_reset_button()
Merge commit 'github/testing' into beta