merging dev with production/main#54

marknichting wants to merge 2 commits intomainoslabs-beta/Khartes:mainfrom

devoslabs-beta/Khartes:devCopy head branch name to clipboard