merge with branch 8.xx_Dialog_Design