Merge "cm: add selective based spn (2/2)" into cm-11.0