Offline message support
conclude merge