master-bc-2630

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