CORAL-136: check for root resource correctly
Merge branch 'dev' for release 1.0.18.3
release 1.0.18.3