Oleg comments

Results 2 comments of


                                            Oleg

@whiskeysierra Thank you for your comment! I rebased onto main.

@whiskeysierra Could you please check this pr