master-bc-2380

https://issues.liferay.com/browse/LIFERAYQA-10962
https://issues.liferay.com/browse/LIFERAYQA-9393