master-bc-1119

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