SME: sbiarozk User story: This needs to be done upstream first.
QDOCS-67 Review the Security topics that have been optimized; determine what else needs to be fixed in them