master-bc-1294

https://issues.liferay.com/browse/LIFERAYQA-7971
https://issues.liferay.com/browse/LIFERAYQA-7765