master-bc-2610

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