master-bc-2463

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