master-bc-2663

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