master-bc-1676

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