[PMC-481] PMC-481