Merging develop to main#5

cliffg-softwarelibre merged 2 commits intomainconnectivecpp/shared-buffer:mainfrom

developconnectivecpp/shared-buffer:developCopy head branch name to clipboard