master-bc-1725

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