Commits in sup/mainline:rerun_crypto_selector