Merged stable branch into default

This brings in the taming of protobuf version.
4 jobs for !109 with topic/default/merge-stable in 3 minutes and 57 seconds (queued for 1 second)
latest merge request