Merge branch 'bugfix/qa-fixes' of gitlab.makuracreations.xyz:rajshah/makura-2025 into bugfix/qa-fixes
