PN-7736 - update from code review