Merge "Made spatial picking optimization optional for now"