missed merge from stable branch