master-bc-2320

https://issues.liferay.com/browse/LIFERAYQA-10739
https://issues.liferay.com/browse/LIFERAYQA-10728