ps:P-171702 code review