Merge branch 'typedef arraydef issues fixed'