master-bc-1588

https://issues.liferay.com/browse/LIFERAYQA-8626
https://issues.liferay.com/browse/LIFERAYQA-8643
https://issues.liferay.com/browse/LIFERAYQA-8582
https://issues.liferay.com/browse/LIFERAYQA-8690