Merge "update to new Consumer APIs"