master-bc-2587

https://issues.liferay.com/browse/LIFERAYQA-11338
https://issues.liferay.com/browse/LIFERAYQA-11361