Update changelog See merge request !3073 (cherry picked from commit 837c929b) f1ffe1da Update changelog