Merge design-audit remediation changes from 51278a70d#817

BigSimmo wants to merge 2 commits into

mainBigSimmo/Database:mainfrom

codex/design-audit-main-merge-safe-final-806-final2BigSimmo/Database:codex/design-audit-main-merge-safe-final-806-final2Copy head branch name to clipboard