Add some context to updated messages
(cherry picked from commit dde5bf8ddf07a64948c89661b836ebc49d07cfb6)