master-bc-2874

https://issues.liferay.com/browse/LIFERAYQA-11987
https://issues.liferay.com/browse/LIFERAYQA-11988