Merge in upstream changes and update CI

Merged Sylvester Joosten requested to merge merge into master

Merge request reports