Ticket: OS#1684 Change-Id: I70d3014deb459e0b91a9a92c60710b994153538e
Ticket: OS#1684 Change-Id: I1045c20dd7234d425836ba93fa292a35ccddc7fd