root: sync changes from stable branch