master-bc-1194

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