Merge "Fix issues with >2D launches"