master-bc-1492

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