Brought up to lated ddd-som build with new repos