QRDL-963 Change-Id: I2e79545c17ad6813f5ca62d50a0c7bb1d42f08ec (cherry picked from commit 7d446770) (cherry picked from commit e5673a58)