master-bc-1682

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