Merge "Position NSSL by scene" into main