Feature/backend cleanup#1026

Isti01 wants to merge 8 commits intostagingkir-dev/cmsch:stagingfrom

feature/backend-cleanupkir-dev/cmsch:feature/backend-cleanupCopy head branch name to clipboard