master-bc-2193

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