Merge branch 'batman-adv-fixes'