master-bc-2051

https://issues.liferay.com/browse/LIFERAYQA-10057
https://issues.liferay.com/browse/LIFERAYQA-10073