CAPX-66: Improved empty values handling.