master-bc-1027

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