master-bc-1475

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