Fixed issues in Mac or Windows Upstream-commit: 23bdb3b3a6d5a1a5219a6b82ac6f22ec011b3e81 Component: engine