add with-stub_status
Merge branch 'stub_status'