master-bc-1759

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