[[ Bug 12558 ]] Increase flexibility of version string check