master-bc-1500

https://issues.liferay.com/browse/LIFERAYQA-8475
https://issues.liferay.com/browse/LIFERAYQA-8297