unmerge #509 from 0.8.4 release build