master-bc-1429

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