master-bc-3108

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