Merge "Fix neutron empty string check"