Merge "Remove reference to compatibility layer"