PFC-2434 #comment done