Merge branch 'asus-cleanup' into test