merge changes from AS repo to fork