Merge 4.5 to master

I saw conflicts in the following two commits and resolved in favour of master commit

4.5: d82e556dcd980bac50f27eaca284983808e04b1c
master: 68745ae9b1652393974f457137c9c7c1df333810