APD-221: Updated message.properties file
Merge branch 'APD-221-b' into develop