fold 17148 into changelog