master-bc-1425

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