Stable branch merged up to 2.3.21