Merge pull request #1015 from ecsv/batman-adv-2023.2