master-bc-1083

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