master-bc-2747

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