Sync 8-8-stable-ee to master
I solved some merge conflicts that arose when merging CE 8-8-stable (which contains the latest master branch) into 8-8-stable-ee.
I solved some merge conflicts that arose when merging CE 8-8-stable (which contains the latest master branch) into 8-8-stable-ee.