master-bc-1705

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