rd-pn-c2 #536