Merge "Use compat framework for API behavior"