master-bc-2709

https://issues.liferay.com/browse/LIFERAYQA-11604
https://issues.liferay.com/browse/LIFERAYQA-11570