Fix WK-365
Merge branch 'development' of github.com:InformationIntegrationGroup/Web-Karma into development