master-bc-1186

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