master-bc-2252

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