Take over changes for 4.7 by @leofonic to OXIDprojects