Merge10.2.x 10.1.x

[rishabhbits038]

Problem

Master build earlier had failed because pint merge from 10.1.x wasn't done and changes from 10.1.x were not present in 10.2.x.

Manually merged the changes from 10.2.x to 10.2.x

Solution

Does this solution apply anywhere else?

• [ ] yes
• [ ] no

If yes, where?

Test Strategy

Testing done:

• [ ] Unit tests
• [ ] Integration tests
• [ ] System tests
• [ ] Manual tests

Release Plan