Merge quota fix from Chengguang.