[#58115110] [#58115066] impoved version handling better