Merge branch 'gp/status-rebase-i-info'