Change-Id: Icd397a2ddd730ae525233b66288fde9a6798c221 TICKET: CYNGNOS-2670
TICKET: CYNGNOS-2299 Change-Id: Ia6c6a1ee901f4f94446c379cbceabfdfced651ef