master-bc-3050

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