CMO and paramedic access tweaks
Merge pull request #408 from Xaltonon/send-to-upstream

CMO and paramedic access tweaks