master-bc-1086

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