master-bc-1195

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