master-bc-2032

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