Change-Id: If356d285006c0b9b57879d0499b8144eca820cab Related: OS#4006, SYS#4895
Change-Id: I739ae5da22c603fb2cf1e84d3a79fb1a6e7343b6 Related: OS#4006, SYS#4895