master-bc-1615

https://issues.liferay.com/browse/LIFERAYQA-8418
https://issues.liferay.com/browse/LIFERAYQA-8540