master-bc-2844

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