file cleanup
Merge branch 'master' into next
fixed warning (endif with wrong parameters)
added string-string map
Merge branch 'FlorianRudolf/feature-pipeline-types' into next