Merge branch 'server-file-monitor-check' into release-3.12

Merge-request: !2556