Add missing messages
Merge branch 'missing-msg' into dev