master-bc-1060

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