Merge branch: sanity