Addres book core from ab-core 2
Merge branch 'ab-core'