master-bc-1098

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