[HOTFIX] Startup performance improvements, improvements in coerce callbacks