[PMC-389] PMC-389