Resolved conflict regarding Identity model comparison bugfix [ATMO-1086].
Resolved conflict regarding Identity model comparison bugfix [ATMO-1086].

CCI-MOC/GUI-Frontend,CCI-MOC/GUI-Frontend,CCI-MOC/GUI-Frontend,CCI-MOC/GUI-Frontend,CCI-MOC/GUI-Frontend