#621 use singleton for identity delegate
#617 missed build files