No event cache can get a favorite point (#4287)
Merge branch 'issue-4287' into release
Merge branch 'release' into upstream