Pull sn-features into release branch