PFC-2444 #comment basework