Merge branch 'rt/cherry-pick-continue-advice-in-status'