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