master-bc-1510

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