Merge "Fix ConsumerException caused NPE." into studio-1.4-dev