PFC-2418 #resolve