Merge tag 'upstream/2.26'

Upstream version 2.26
Imported Upstream version 2.26
2.26-1
ignore artifacts
Imported Upstream version 2.27
Merge tag 'upstream/2.27'

Upstream version 2.27
changelog for 2.27-1