Merge "Move getVersion line cleanup to main"