merge 40316 33507 30108