Merge "End support for stable/xena"