(cherry picked from commit 8af4246ff9baee4c291550102769a1186f65dc29)
Since it applies to all of frontend, I think it makes more sense to have it here instead of src (cherry picked from commit e12c679cd8961ec9d2ef744761303831b81e64fb)