Merge "Add compat workaround"