master-bc-2506

https://issues.liferay.com/browse/LIFERAYQA-11174