master-bc-2360

https://issues.liferay.com/browse/LIFERAYQA-10908
https://issues.liferay.com/browse/LIFERAYQA-10943