master-bc-1489

https://issues.liferay.com/browse/LIFERAYQA-8151
https://issues.liferay.com/browse/LIFERAYQA-8431