Merge the latest version 2.11.10 changes