Merge "Update font axis callsite" into main