* Fixed bug wrong port value is set on import
* Prepare SAF enablement