Merge pull request #9618 from flightng/fix_at32_targets_rebase