Merge "improve compatibility"