merge with cfc-landing