master-bc-2187

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