master-bc-1799

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