master-bc-2512

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