Merge "Fix build error for a new SP"