Import r18499 from MC (was: Sync with ports (really soon committed)