Crowdcon 6

Please see
https://jira.tinynova.com/browse/CROWDCON-6