Merge spine from Upstream