Merge "Enable builtin formatting hooks" into main