Merge release 0.7.7 from master to dev