Merge branch 'aa/status-hilite-branch' into next