[PMC-392] PMC-392