Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev