master-bc-1092

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