Space DAO correct some quality errors
Merge origin/master