add null check
update outputs
Merge branch 'refs/heads/master' into stable