Merge "Prep for mod2 seedcode (poc) delivery"