master-bc-2653

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