master-bc-1461

https://issues.liferay.com/browse/LIFERAYQA-8372
https://issues.liferay.com/browse/LIFERAYQA-8377