Merge branch 'AS-INIT'