master-bc-998

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