master-bc-1737

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