master-bc-2748

https://issues.liferay.com/browse/LIFERAYQA-11305
https://issues.liferay.com/browse/LIFERAYQA-11363