Merge "CCSDK-3480 Allow empty variables."