Merge branch 'mg/advice-statushints'