[PMC-425] PMC-425