Today
Merge from main (a lot of viewmodel conflicts)