Merge branch 'release-1.8.3'
Revert a fix earlier that broke dynamic .info name
Version bumped from  1.8.3 to 1.8.4
Merge branch 'release-1.8.4'