[X2Go-Dev] Processed: Merging this with #625