core and pkasi
Merge branch 'bug1'