master-bc-2389

https://issues.liferay.com/browse/LIFERAYQA-10974
https://issues.liferay.com/browse/LIFERAYQA-10984