master-bc-1767

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