Merging release 0.7.3 from master to dev