master-bc-2329

https://issues.liferay.com/browse/LIFERAYQA-10777
https://issues.liferay.com/browse/LIFERAYQA-10778