* Port some stuff from #2048 to snapshot
* Apply suggestions from code review
Co-authored-by: YanisBft <doublecraft.official@gmail.com>
* Apply suggestions from code review
Co-authored-by: YanisBft <doublecraft.official@gmail.com>
Co-authored-by: YanisBft <doublecraft.official@gmail.com>