merger 6 commit in boox-opencource