master to dev for release 0.6.1