master-bc-2758

https://issues.liferay.com/browse/LIFERAYQA-11591
https://issues.liferay.com/browse/LIFERAYQA-10887