Imported Upstream version 5.5.39
Merged with upstream 5.5.39