port to 4.4 branch