master-bc-1581

https://issues.liferay.com/browse/LIFERAYQA-8634
https://issues.liferay.com/browse/LIFERAYQA-8636
https://issues.liferay.com/browse/LIFERAYQA-8649