master-bc-2552

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