master-bc-1495

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