backport of #3271
Merge branch 'stable5' into files_encryption_stable5