Merge branch 'zimbatm/bug/header-args' into patch