Merge "split-select: fix OSX build" into lmp-mr1-dev