Merge pull request #1657 from ssshyam/4_4_x