#6788 changelog