Merging release 0.8.4 from master to dev