HiMrQUAN-3417

HiMrQUAN-3417