master-bc-964

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