master-bc-1033

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