Merge branch 'refs/heads/t/rm_as_compat'