Updated messages with a new scope

Change-Id: I403dbb40afddb54932fadeae15e49b150b033954
Merge "Updated messages with a new scope" into develop