[PMC-395] PMC-395