taks #00025-Status_messages: Features update
Merge branch '00025-Status_messages' into develop