master-bc-1143

https://issues.liferay.com/browse/LIFERAYQA-7707
https://issues.liferay.com/browse/LIFERAYQA-7706