Merge "Fixing issues with pattern recovery / account view (issue 7341237):" into jb-mr1-dev