towards MARMOTTA-543 (modular function support):
- modularized most functions, but they are currently not yet used
Merge remote-tracking branch 'origin/develop' into develop