Additional changes need after merge from master.