Appled 4083 patch to 2.3 branch