Merging latest changes from stable branch up to 2.3.24