PFC-2405 #comment done