- Merge Pull Request #16021 from thomas-blackbird/magento2:feature/cms-block-source
 - Merged commits:
   1. 31e6bc2
   2. e4ede9b

 - Merge Pull Request #17479 from Karlasa/magento2:lib-docs-utilities
 - Merged commits:
   1. 916e4ef
   2. 2e1d7c3
   3. 71db151
   4. 69fbdca
   5. 4cbfc88
   6. ccdb491
   7. 0ea749c
   8. e1c5d55
   9. 8d478e8
   10. 2f3ba20
   11. 9becc67
   12. 87af819
   13. fcf9d27
   14. 7956fab
   15. 5030f64
   16. f598bba
   17. b62c3ed
   18. 432dd6a
   19. c1488a1
   20. ef187c7
   21. e7e376f
   22. ad05aee
   23. 5d9ceb5
   24. d0a78ec
   25. ff2bfcb

…tion>General>Reports>Dashboard #17289 #17383

…velop-PR

…velop-PR

Changed newly introduced variable VatNumberSanitized to reqVatNumSanitized to meet coding standards.

Accepted Public Pull Requests:
 - #17383: Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>Reports>Dashboard #17289 (by @teddysie)


Fixed GitHub Issues:
 - #17289: Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>Reports>Dashboard (reported by @joshuaflood) has been fixed in #17383 by @teddysie in 2.2-develop branch
   Related commits:
     1. 2c64c16
     2. 5e847c4

…velop-PR

PANDA-2.2-develop-PR

… configuration #15171

…Rules #16855

Accepted Public Pull Requests:
 - #15171: AD-HOC feat (Profiler): Allow supplying complex profiler configuration (by @andrewhowdencom)
 - #16855: Doesn't work if use date as condition for Catalog Price Rules (by @GlennCheng)

…3649

 - Merge Pull Request #13649 from mimarcel/magento2:fix/undefined-index-when-caching-config-data
 - Merged commits:
   1. 208abdd

 - Merge Pull Request #17515 from emiprotech/magento2:bugfix-16499
 - Merged commits:
   1. 4a29647

 - Merge Pull Request #17527 from Yogeshks/magento2:yogesh-patch-8
 - Merged commits:
   1. de0ec20
   2. 0c1104f

…3649

…into yogesh-patch-6

Without the default sort order this fieldset goes to the very bottom after custom fieldset is added to the form

+ Complex statement that was executed three times moved to separate
method so the logic is only on one place
+ The calculation for the index of the last record moved to a variable
so the calculation is only being done once. This also reduces the amount
of times `this.getChildItems()` is being called.

# Conflicts:
#	app/code/Magento/Backend/Block/Media/Uploader.php

…required one

Accepted Public Pull Requests:
 - #13649: Fix possible undefined index when caching config data (by @mimarcel)

When you get to the web setup wizard from the Magento back-end it was
not possible to get back to the back-end from this page.

This commit makes the logo clickable and when you click it you will
return the Magento back-end.

…ry editor changes the position of the 'General' fieldset #17540

 - Merge Pull Request #17540 from vasilii-b/magento2:2.2-category-form-general-fieldset-wrong-sort-order
 - Merged commits:
   1. 1e1647a

Fix code style

 - Merge Pull Request #17526 from gelanivishal/magento2:issue-17492
 - Merged commits:
   1. c789fb2
   2. 7aecb1f

 - Merge Pull Request #17505 from arnoudhgz/magento2:refactor/ui-dynamic-rows-remove-some-duplication
 - Merged commits:
   1. 7e87221

…ari #17491

 - Merge Pull Request #17491 from dannynimmo/magento2:back-port-pull-17426
 - Merged commits:
   1. 0f59151

 - Merge Pull Request #17561 from dmytro-ch/magento2:2.2-unit-tests-catalog-cron
 - Merged commits:
   1. ae388e8

Accepted Public Pull Requests:
 - #17505: Refactor: remove some code duplication (by @arnoudhgz)
 - #17479: updating lib LESS docs (by @Karlasa)

…15357

…show information about Configurable products

 - Merge Pull Request #17552 from adrian-martinez-interactiv4/magento2:FR22#FIX-PROXY-GENERATION-RETURN-TYPE
 - Merged commits:
   1. 70d8491

…404 page #13102 #15369

 - Merge Pull Request #15369 from Ananth747/magento2:Ananth747-patch-1
 - Merged commits:
   1. a1d0e3b
   2. b81bf67
   3. b0848c4
   4. f5bd1c6

…atter by UnitTest

…17590

 - Merge Pull Request #17590 from eduard13/magento2:2.2-develop-credit-cart-token-formatter-ut
 - Merged commits:
   1. 91999b8

 - Merge Pull Request #17575 from Yogeshks/magento2:yogesh-patch-9
 - Merged commits:
   1. 47cbfff

[TSG] Backporting for 2.2 (pr40) (2.2.7)

 - Merge Pull Request #17543 from arnoudhgz/magento2:bugfix/13948-make-logo-link-to-backend-web-setup-wizard
 - Merged commits:
   1. d10de87

… other payment does not #13133

…17590

…ry editor changes the position of the 'General' fieldset #17540

…ari #17491

…404 page #13102 #15369

…15357

…arks on Magento 2.2.5 #17013

 - Merge Pull Request #17013 from ronak2ram/magento2:ronak2ram-patch-4
 - Merged commits:
   1. 3259f5a
   2. ae24b01

 - Merge Pull Request #17484 from iGerchak/magento2:Fix-sending-duplicate-emails
 - Merged commits:
   1. a69ced7

Accepted Public Pull Requests:
 - #13133: Magento PayPal checkout fails if email sending fails / other payment does not (by @driskell)
 - #17590: Braintree: Add unit test for CreditCard/TokenFormatter (by @eduard13)
 - #17552: Fix proxy generation return type (by @adrian-martinez-interactiv4)
 - #17540: Fix for #15041 Adding a new fieldset to the admin category editor changes the position of the 'General' fieldset (by @vasilii-b)
 - #17526: Fixed undefinded shipping method name issue #17492 (by @gelanivishal)
 - #17491: [Backport] Fix incorrect image magnifier size bug in Safari (by @dannynimmo)
 - #16021: Introduce Block Config Source (by @thomas-blackbird)
 - #15369: Fixed review list ajax if product not exist redirect to 404 page #13102 (by @Ananth747)
 - #15357: 6305 - Resolved product custom option title save issue (by @Madhumalak)
 - #14973: Fix unstable session manager (by @elioermini)


Fixed GitHub Issues:
 - #15041: Adding a new fieldset to the admin category editor changes the position of the 'General' fieldset. (reported by @leoquijano) has been fixed in #17540 by @vasilii-b in 2.2-develop branch
   Related commits:
     1. 1e1647a

 - #17492: "- undefined" displayed in checkout summary when shipping method name is not set (reported by @krzksz) has been fixed in #17526 by @gelanivishal in 2.2-develop branch
   Related commits:
     1. c789fb2
     2. 7aecb1f

 - #17416: Product image zoom (magnifier) is broken in Safari (reported by @dannynimmo) has been fixed in #17491 by @dannynimmo in 2.2-develop branch
   Related commits:
     1. 0f59151

 - #13102: review/product/listAjax/id/{{non existent id}/ (reported by @ruthger92) has been fixed in #15369 by @Ananth747 in 2.2-develop branch
   Related commits:
     1. a1d0e3b
     2. b81bf67
     3. b0848c4
     4. f5bd1c6

 - #6305: Can't save Customizable options (reported by @bachlee89) has been fixed in #15357 by @Madhumalak in 2.2-develop branch
   Related commits:
     1. 474946c
     2. 9dd8945
     3. 641c556
     4. 3c444ce

 - #12362: Concurrent (quick reload) requests on checkout cause cart to empty - related to session_regenerate_id (reported by @minlare) has been fixed in #14973 by @elioermini in 2.2-develop branch
   Related commits:
     1. 5e66f1b
     2. 8f033ac
     3. 6ee737b
     4. d63c2c3
     5. 5dbce2a
     6. b186567
     7. eabccc8

…tep. #17593

 - Merge Pull Request #17593 from eduard13/magento2:2.2-develop-14819-issue
 - Merged commits:
   1. 8739f8e

…dle option. #16777

Accepted Public Pull Requests:
 - #17543: Link logo in web setup wizard to back-end base URL (by @arnoudhgz)
 - #17575: Translated validation error messages (by @yogeshks)
 - #17527: Refactor JS code and added JS component file (by @yogeshks)
 - #16777: Fix Translation of error message on cart for deleted bundle option. (by @swnsma)


Fixed GitHub Issues:
 - #13948: Sidebar shortcut to admin dashboard (Magento logo on top left) has no link in web setup wizard (reported by @doctormess) has been fixed in #17543 by @arnoudhgz in 2.2-develop branch
   Related commits:
     1. d10de87