master-bc-2161

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