CRM - 14275 Patch 4.4 branch with Report fix as faulty code still in 4.4.5

Patching the 4.4 branch as well as 4.4.5 has the faulty code still in it