Merge "Ganymed patch fix"