last changes for gradle branch