master-bc-2300

https://issues.liferay.com/browse/LIFERAYQA-10056
https://issues.liferay.com/browse/LIFERAYQA-10716