master-bc-2178

https://issues.liferay.com/browse/LIFERAYQA-10419
https://issues.liferay.com/browse/LIFERAYQA-10359