Merge "Skip binder error handler if freezer is disabled" into main