Merge "This should fix T105373"