US3 [REBASE] - temp remove US2

(cherry picked from commit 7a7e31a51ebfb2313e815012671ae0410936364e)