master-bc-2644

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