master-bc-2509

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