SmartSync support and latest from unstable