master-bc-1634

https://issues.liferay.com/browse/LIFERAYQA-8788
https://issues.liferay.com/browse/LIFERAYQA-8799
https://issues.liferay.com/browse/LIFERAYQA-8802