master-bc-2626

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