Upgraded XCRI 10/12 Handlers to use NewGazService as well as A. Smith fix