master-bc-2601

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