Merge branch 'hotfix-1.1.2'
Waiting for all threads to finish current message processing
Use Janitor to dispose
Code cleanup
Moved purge to Init
Merge branch 'hotfix-1.1.3' into develop