LPS-39820 Support empty value