case 3784 - Check the mepty categories with actual node pick criteria.
Merge branch 'case-3784' into develop