master-bc-3171

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