Merged the latest version 2.11 changes