Merge "Refactor adding message to source change in cherry pick"