master-bc-1327

https://issues.liferay.com/browse/LIFERAYQA-8038
https://issues.liferay.com/browse/LIFERAYQA-8029