WIP: Defend Component#7

zalsaigh wants to merge 9 commits intomainzalsaigh/monarch:mainfrom

feature/defend-componentzalsaigh/monarch:feature/defend-componentCopy head branch name to clipboard