[PMC-467] PMC-467