[PMC-475] PMC-475