Report fix from master

Fix pb when launching commandwatcher in non-rez env
comit:8f25a7f1634c9e6e84b6a078738987cfbfd4511c