Merge branch 'IO-message-cleanup' into develop