Merge branch 'master' into hotfix/v1.12.2

Author: patzick

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,17 +23,18 @@ https://stackblitz.com or with a screenshot if it's more accurate.
 
 
 
-## Repository
-<!-- If possible, share a repository link where this problem occurs -->
-
+## Version of Vue Storefront
+<!-- Is it next or current VSF -->
+- [ ] Vue Storefront
+- [ ] Vue Storefront Next
 
 
 ## Can you handle fixing this bug by yourself?
 
 - [ ] YES
 - [ ] NO
 
-## Which [Release Cycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html) state this refers to? Info for developer.
+## Which [Release Cycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html) state this refers to? Info for developer. (doesn't apply to Next)
 Pick one option.
 
 - [ ] This is a bug report for test version on https://test.storefrontcloud.io - In this case Developer should create branch from `develop` branch and create Pull Request `2. Feature / Improvement` back to `develop`.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -9,24 +9,21 @@ labels: feature request
 <!-- Describe the motivation or the concrete use case for new feature or why one of current ones should be enhanced. -->
 
 
-
 ## What are the acceptance criteria 
 <!-- List the acceptance criteria for this task in a form of a list. -->
 
 - [ ] ...
 
+## Version of Vue Storefront
+<!-- Is it next or current VSF -->
+- [ ] Vue Storefront
+- [ ] Vue Storefront Next
+
 ## Can you complete this feature request by yourself?
 
 - [ ] YES
 - [ ] NO
 
-## Which [Release Cycle](https://docs.vuestorefront.io/guide/basics/release-cycle.html) state this refers to? Info for developer.
-Pick one option.
-
-- [x] This is a normal feature request. This should be available on https://test.storefrontcloud.io and then after tests this can be added to next Vue Storefront version. In this case Developer should create branch from `develop` branch and create Pull Request `2. Feature / Improvement` back to `develop`.
-- [ ] (**Pick this option only if you're sure**) This is an important improvement request for current Release Candidate version on https://next.storefrontcloud.io and should be placed in next RC version. In this case Developer should create branch from `release` branch and create Pull Request `3. Stabilisation fix` back to `release`.
-- [ ] (**Pick this option only if you're sure**) This is a critical improvement request for current Stable version on https://demo.storefrontcloud.io and should be placed in next stable version. In this case Developer should create branch from `hotfix` or `master` branch and create Pull Request `4. Hotfix` back to `hotfix`.
-
 ## Additional information
 <!-- If you think that any additional information would be useful please provide them here. -->