Merging release 0.7.4 from master to dev