master-bc-2449

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