sync up to stable v3