Bug #17307 -- notice ==> status
Merge branch 'feature/17307_messages' into develop