master-bc-1178

https://issues.liferay.com/browse/LIFERAYQA-7701
https://issues.liferay.com/browse/LIFERAYQA-7720