[master] More changes to support Spoke sharing with FB