master-bc-2701

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