last changes to jsf branch