Merge "Remove actions that delay standby flow" into sc-dev