Merge "Propagate desks changes" into main