Merge branch 'SLPSet/smartptr' into SLPs