Some specific changes for our own workflow
Merge branch 'release/1.1.22a'