Final commit for IDMAPPS-548