Feature/replace make functions

Müller, Felix requested to merge feature/replace_make_functions into master

See individual commits

Merge request reports