master-bc-1795

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