Merge changes from the 1.7.9 develop branch since 1.7.9 release