Merge "End support for stable/zed"