Closes #6411 Authored by: bashonly
Closes #6344 Authored by: Grub4K
Closes #1839 Authored by: Grub4K, bashonly Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>