master-bc-1104

https://issues.liferay.com/browse/LIFERAYQA-7543
https://issues.liferay.com/browse/LIFERAYQA-7603