Merge branch 'acer' into release