master-bc-3204

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