3.11.9 imported into git