master to dev for release 0.8.4