Fixed merge conflict with R15 __LEGACY_API define