[PMC-471] PMC-471