Merge branch 'zk/clean-report-failure' into maint