catch up with master, fix default args