Merge branch 'ks/status-initial-commit'