Prep for BaseCode 3b merge