Merge branch 'dnp/message_watch_input' into sprint47