master-bc-2036

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