master-bc-1041

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