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