master-bc-999

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