master-bc-3027

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