Merge branch 'fix-ClearSourcesCache' into release-3.16

Merge-request: !4751