changes for kafka upgrade