Related: OS#4945 Change-Id: I9a7cf40e68cc246cab81f8c93485b83f75dcf778
Related: OS#4945 Change-Id: Ic0e80000b377f80c3914e607e94e998e9862ceac