master-bc-1594

https://issues.liferay.com/browse/LIFERAYQA-8618
https://issues.liferay.com/browse/LIFERAYQA-8644
https://issues.liferay.com/browse/LIFERAYQA-8689
https://issues.liferay.com/browse/LIFERAYQA-8530
https://issues.liferay.com/browse/LIFERAYQA-8693
https://issues.liferay.com/browse/LIFERAYQA-8668