[us36752] rebase settings od TB
[us36752] missing files
add wish component
us34602 update