[Panda] Before merge