Merge "Adding UserAwareSecureSettingsRepository" into main