Merge ConfigService Update + Fujitsu merge