Merge branch 'main' into 'main'
Fix bugs when marking a file as patrolled
See merge request toolforge-repos/nfp!1