Update invalid message
Merge branch 'MH-355' into dev