Merge branch 'CustomSocketAndPortDBSupport' into liveSystem
Merge branch 'develop' into liveSystem