master-bc-2145

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