master-bc-1193

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