master-bc-2439

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