master-bc-992

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