merge with insert title
Merge branch 'master' into staging
handle status config replacement gracefully