master-bc-2156

https://issues.liferay.com/browse/LIFERAYQA-10333
https://issues.liferay.com/browse/LIFERAYQA-10148