Merged changes form stable branch up to 2.3.13