Merge branch 'jg/status-config'