[PMC-469] PMC-469