Feature merge 0.10 in master

nt