Resolve #3504664 "Latest"

Chris Wellsrequested to merge
issue/project_browser-3504664:3504664-latest into 2.1.x

Closes #3504664

Merge request reports