master-bc-2497

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