master-bc-2146

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