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

* commit 'be593a7778fe053f67fa37dcc2174639ed725b17':
  split-select: fix OSX build