[PMC-483] PMC-483