fw/base & Settings now legacy
Merge branch 'origin/jbl-4.3'