Merge branch 'ashift'