merge with master
merge w master
merge w master
multiple cleanup & fixes
merge w precise