master-bc-1680

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