Merge branch 'andy128k' into andy128kr