Ported to new glhck/qmlon/engineworks