PFC-2423 #comment implemented