Cherry picked proper rc version handling