master-bc-3257

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