Merge tag 'upstream/583'

Upstream version 583
Imported Upstream version 583
changelog
Merge tag 'upstream/584'

Upstream version 584
Imported Upstream version 584
updated changelog
Imported Upstream version 585
Merge tag 'upstream/585'

Upstream version 585
updated changelog