371994642d
Use navigate instead of resolver Original-merge: 2e4e4050cd4f8b0c8decb6092e5b06ceb3efd839 Merged-by: thornbill <thornbill@users.noreply.github.com> Backported-by: thornbill <thornbill@users.noreply.github.com>