sync to CompJournoStick 1.9.x