Merge pull request #7585 from keymanapp/fix/developer/298-avoid-reformatting-unchanged-system-stores fix(developer): avoid reformatting unchanged system stores