Merge branch 'unset_helper'