master-bc-1058

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