Synced to upstream 5.5.33
Synced to upstream 5.5.33a
Fix d/changelog day
Imported upstream 5.5.34
Merged with upstream 5.5.34