PFC-2466 #comment preparation