master-bc-2338

https://issues.liferay.com/browse/LIFERAYQA-10836
https://issues.liferay.com/browse/LIFERAYQA-10835