sync latest fix from desktop gl