2220
2221
2222: not need CorrectImageBoxes()

move to dbug
Merge branch 'v1.7dev' into v1.7