master-bc-1775

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