Updated returned messages
Merge branch 'development' into dev/j3/common