Change-Id: I2916b1462c1f0b9582f4fefac82f60c20f820b85 TICKET: CYNGNOS-2303
TICKET: CYNGNOS-2299 Change-Id: Ia6c6a1ee901f4f94446c379cbceabfdfced651ef