master-bc-1398

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