Hotfix/cherry pick remove deploy status