PFC-2368 #comment done