Fix virtual CSW init on startup.
Merge remote-tracking branch 'origin/develop' into develop