master-bc-2107

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