Merge "Fix selector bug" into lmp-mr1-dev