master-bc-2957

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