master-bc-1377

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