Merge "Adding flag for unicorn feature refactoring in HSUM" into main