Merge branch 'helpers' into updates