Merged changes form stabel branch up to the current state (2.3.22+).