Merged changelog updates from stable