master-bc-1447

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