Merge "DO NOT MERGE: Ensure zen SystemConditions are subscribed" into pi-dev