DO NOT MERGE - temp test fix for 4.4
I will merge once in 4.4