Prototype-to-Pilot DFM changes #1

Open
sherry wants to merge 2 commits from develop into main
ECAD Changes