Merge "Fix is_neutron_legacy_enabled function"