Partial fix for #21113, checking change message before displaying.
#21113 Fixed merge.