master-bc-983

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