fixed no version handling
Merge branch 'release/4.1.39'