Merge branch 'active' (rename)