Ready for cross-svr Smartlink dev