fix @master_branch error
Merge branch 'hotfix/nil_versions'