Merged ezzkaa changes