CORE-4193: Added support for Hierarchical list selector.
Merge branch 'master' into STABLE