PHP-CS-Fixer: Comment wrongly indented

CS fixer version: latest 2.16

Original code and expected result:

class CrudHelper
{
    public function makeCrudFromModel($model): MyCrud
    {
        // set model options
        if ($model instanceof Model\Invoice) {
            $model->getField($model->fieldName()->my_address_id)->default = 123456879;
            // @TODO
        } elseif ($model instanceof Model\InvoiceItem) {
            // @TODO
            $a = [
//                'test',
            ];
        }
// test
    }
}

badly fixed to:

class CrudHelper
{
    public function makeCrudFromModel($model): MyCrud
    {
        // set model options
        if ($model instanceof Model\Invoice) {
            $model->getField($model->fieldName()->my_address_id)->default = 123456879;
        // @TODO
        } elseif ($model instanceof Model\InvoiceItem) {
            // @TODO
            $a = [
                //                'test',
            ];
        }
// test
    }
}

there are two indent issues:

1. 4 spaces are removed badly for the first // @TODO comment - related with https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/6490#issuecomment-1186203584
2. code commented with // right after a new line should never be moved, even if inside an array

config:

<?php

$finder = PhpCsFixer\Finder::create()
    ->in([__DIR__])
    ->exclude([
        'cache',
        'build',
        'vendor',
    ]);

return PhpCsFixer\Config::create()
    ->setRiskyAllowed(true)
    ->setRules([
        '@PhpCsFixer' => true,
        '@PhpCsFixer:risky' =>true,
        '@PHP71Migration:risky' => true,
        '@PHP73Migration' => true,

        // required by PSR-12
        'concat_space' => [
            'spacing' => 'one',
        ],

        // disable some too strict rules
        'phpdoc_types' => [
            // keep enabled, but without "alias" group to not fix
            // "Callback" to "callback" in phpdoc
            'groups' => ['simple', 'meta']
        ],
        'phpdoc_types_order' => [
            'null_adjustment' => 'always_last',
            'sort_algorithm' => 'none',
        ],
        'single_line_throw' => false,
        'yoda_style' => [
            'equal' => false,
            'identical' => false,
        ],
        'native_function_invocation' => false,
        'non_printable_character' => [
            'use_escape_sequences_in_strings' => true,
        ],
        'void_return' => false,
        'combine_consecutive_issets' => false,
        'combine_consecutive_unsets' => false,
        'multiline_whitespace_before_semicolons' => false,
        'no_superfluous_elseif' => false,
        'ordered_class_elements' => false,
        'php_unit_internal_class' => false,
        'php_unit_test_case_static_method_calls' => [
            'call_type' => 'this',
        ],
        'php_unit_test_class_requires_covers' => false,
        'phpdoc_add_missing_param_annotation' => false,
        'return_assignment' => false,
        'comment_to_phpdoc' => false,
        'list_syntax' => ['syntax' => 'short'],
        'general_phpdoc_annotation_remove' => [
            'annotations' => ['author', 'copyright', 'throws'],
        ],
        'nullable_type_declaration_for_default_null_value' => [
            'use_nullable_type_declaration' => false,
        ],
    ])
    ->setFinder($finder)
    ->setCacheFile(__DIR__ . '/.php_cs.cache');