[PMC-398] PMC-398