Merge branch 'np/addcommit'