@Fridrich: could you take look, maybe we could mark those 2 files as %config so it is not auto overriden?