master-bc-3091

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