tentative merge of EKIT_0_9H and custom patches