master-bc-2548

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