Adding in updates for Mac for upcoming events Upstream-commit: aa057fd3b3f3a2817f01f834482c396cf08ce53d Component: engine