Merge branch 'lk/more-helpful-status-hints'