Merge branch 'switchdev-cleanups'