master-bc-1543

https://issues.liferay.com/browse/LIFERAYQA-8567
https://issues.liferay.com/browse/LIFERAYQA-8576
https://issues.liferay.com/browse/LIFERAYQA-8587