msg timeout + securityInterceptor start
Merge remote-tracking branch 'origin/trunk' into trunk