Applied trunk changes up to r4886