Sync with updated foundation-cli