Merge branch 'js/enhanced-version-info'