Y2T3: Farm-level data storage followups

Follow-up work to build farm-level data storage in PI5 based on community feedback.