Merge "Initial bundle creation for HWTEP SB"