PFC-2456 #comment done