potential sync issue, pulled from upstream.