master-bc-1034

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