merging of master into commerce branch