Make configuration file suffix configurable (rebased onto develop)