master-bc-1035

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