master-bc-1036

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