master-bc-1199

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