Patch for 4.5.0

Bring support for the abd570b7a94da1924f829d6950344df8f20e0898 patch