[BISERVER-8847] Fix CI Errors
Merge pull request #510 from bytekast/master

[BISERVER-8847] Fix CI Errors