Imported Upstream version 5.5.29
Synced to upstream 5.5.32
Manual merge