[X2Go-Dev] Processed: cherry-picked requested commit into release/4.0.0.x branch