master-bc-1645

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