Merge October korpling changes into amir-zeldes/ANNIS