full clean and merge to kriangs dev