Merge "[OOF] Update configuration for NxI termination app"