master-bc-3199

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