master-bc-1414

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