Fixes #6541 change message