master-bc-2005

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