Merged revisioni 312 to configfile branch