master-bc-1739

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