master-bc-2522

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