Merge branch 'abe' into identity_abe