Merge remote-tracking branch 'origin/15.0' into 15.0-store

Author: itpp-bot

.pre-commit-config.yaml

@@ -101,7 +101,7 @@ repos:
         files: /__init__\.py$
         additional_dependencies: ["flake8-bugbear==20.1.4"]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.9.3
+    rev: 5.12.0
     hooks:
       - id: isort
         name: isort except __init__.py