merge trunk into model change 3.6