update from cejug master