Fix merging in application-default configuration