- merged latest identity branch changes / fixes