Refs: #3527 We may also want to consider #1828 when converting branch delete Identify all the cases and create issues to track each one