Merge branch 'mh/status-optionally-refresh'