master-bc-2247

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