CNS-745: Add support for multiple CL and Data environments