Production bug fixes for Mar28 2.3Release