master-bc-989

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