merged CA-1425-font-size-changes