master-bc-1054

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