master-bc-1067

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