Merged stable branch up to 2.3.10