Resolves MMC-4: https://jira.forkk.net/browse/MMC-4
Resolves JIRA issue MMC-9: https://jira.forkk.net/browse/MMC-9