added support for empty values to cockpit
update test
Merged 'dev'.