[tg_owt/f39] (2 commits) ...Remove patch.