Adding missing messages
Merge branch 'missing-msgs' into dev