Merge "fix default software version source"