FP-2/25: Component_Supply

FP-2/25: Component_Supply