Synch with gambie

Pull in new features